Fix geocaching tags for input on xcsv.

diff --git a/gpsbabel/csv_util.c b/gpsbabel/csv_util.c
index 826890826b310771c9579abc995aaf658fb6e73a..5ab7e24ad4ccccc8b4d59f6d6bb0180bb106bc74 100644 (file)
--- a/gpsbabel/csv_util.c
+++ b/gpsbabel/csv_util.c
@@ -505,9 +505,11 @@ xcsv_parse_val(const char *s, waypoint *wpt, const field_map_t *fmp)
        wpt->gc_data.terr = atof(s) * 10;
     } else
     if (strcmp(fmp->key, "GEOCACHE_TYPE") == 0) {
-       /* Geocache Type - TODO */
-       /* wpt->gc_data.type = gs_mktype(s);*/
-
+       /* Geocache Type */
+       wpt->gc_data.type = gs_mktype(s);
+    } else
+    if (strcmp(fmp->key, "GEOCACHE_CONTAINER") == 0) {
+       wpt->gc_data.container = gs_mkcont(s);
     } else {
        warning( MYNAME ": Unknown style directive: %s\n", fmp->key);
     }

diff --git a/gpsbabel/gpx.c b/gpsbabel/gpx.c
index 5348dcdb423dd872604c10798af58eee357578ec..50903cd9b9dd95057a1110acf5fabe5dba4f0d9d 100644 (file)
--- a/gpsbabel/gpx.c
+++ b/gpsbabel/gpx.c
@@ -518,7 +518,7 @@ gs_get_container(geocache_container t)
 
        for (i = 0; i < sz; i++) {
                if (t == gs_container_map[i].type) {
-                       return gs_type_map[i].name;
+                       return gs_container_map[i].name;
                }
        }
        return "Unknown";